few editorial fixes

jasnell · jasnell · commit dd7e0e5934ef · 2014-10-06T10:27:20.000-07:00
diff --git a/activitystreams2-context.jsonld b/activitystreams2-context.jsonld
@@ -531,6 +531,12 @@
      "@type": "owl:Class",
      "rdfs:subClassOf": "as:Object"
    },
+   {
+     "@id": "as:language",
+     "@type": "owl:FunctionalProperty",
+     "rdfs:domain": ["as:Object", "as:Link"],
+     "rdfs:range": "xsd:string"
+   },
    {
      "@id": "as:displayName",
      "@type": "owl:ObjectProperty",
diff --git a/activitystreams2-vocabulary.html b/activitystreams2-vocabulary.html
@@ -352,7 +352,7 @@ <h2>Terms</h2>
 
       <tbody>
         <tr>
-          <td rowspan="3" valign="top"><dfn>language</dfn></td>
+          <td rowspan="4" valign="top"><dfn>language</dfn></td>
           <td valign="top" width="10%">URI:</td>
           <td valign="top"><code>http://activitystrea.ms/2.0/language</code></td>
         </tr>
@@ -368,6 +368,10 @@ <h2>Terms</h2>
           <td valign="top">Domain:</td>
           <td valign="top"><a title="Object"><code>Object</code></a> | <a title="Link"><code>Link</code></a></td>
         </tr>
+        <tr>
+          <td valign="top">Range:</td>
+          <td valign="top">[[!RFC5646]] Language Tag</td>
+        </tr>
       </tbody>
 
       <tbody>
diff --git a/activitystreams2.html b/activitystreams2.html
@@ -302,7 +302,10 @@ <h2>An extended activity</h2>
         "@type": "urn:example:types:person",
         "@id": "urn:example:person:martin",
         "displayName": "Martin Smith",
-        "url": "http://example.org/martin",
+        "url": {
+          "@id": "http://example.org/martin",
+          "displayName": "Martin's Profile"
+        },
         "image": {
           "@id": "http://example.org/martin/image",
           "mediaType": "image/jpeg",
@@ -391,7 +394,8 @@ <h2><dfn title="Object" id="asobject">Object</dfn></h2>
           <a href="activitystreams2-vocabulary.html#dfn-provider">provider</a> | 
           <a href="activitystreams2-vocabulary.html#dfn-published">published</a> |
           <a href="activitystreams2-vocabulary.html#dfn-rating">rating</a> |
-          <a href="activitystreams2-vocabulary.html#dfn-replies">replies</a>
+          <a href="activitystreams2-vocabulary.html#dfn-replies">replies</a> |
+          <a href="activitystreams2-vocabulary.html#dfn-resultof">resultOf</a> |
           <a href="activitystreams2-vocabulary.html#dfn-scope">scope</a> |  
           <a href="activitystreams2-vocabulary.html#dfn-starttime">startTime</a> | 
           <a href="activitystreams2-vocabulary.html#dfn-summary">summary</a> |
@@ -486,19 +490,22 @@ <h2><dfn title="Link">Link</dfn></h2>
       </p>
 
       <p>
-        The target URI of the Link is the global identifier expressed in the JSON-LD
-        serialization using the <code>@id</code> keyword. In addition, all <code>Link</code>
-        instances share the following common set of properties as defined by the 
+        When expressed as a JSON object, the target URI of the Link is the global 
+        identifier expressed in the JSON-LD serialization using the <code>@id</code> 
+        keyword. In addition, all <code>Link</code> instances share the following 
+        common set of properties as defined by the 
         <a href="activitystreams2-vocabulary.html">Activity Vocabulary</a>:
         <code>
           <a href="activitystreams2-vocabulary.html#dfn-displayname">displayName</a> |
           <a href="activitystreams2-vocabulary.html#dfn-duration">duration</a> | 
-          <a href="activitystreams2-vocabulary.html#dfn-height">height</a> | 
+          <a href="activitystreams2-vocabulary.html#dfn-height">height</a> |
           <a href="activitystreams2-vocabulary.html#dfn-icon">icon</a> | 
           <a href="activitystreams2-vocabulary.html#dfn-image">image</a> |
-          <a href="activitystreams2-vocabulary.html#dfn-inreplyto">inReplyTo</a> | 
+          <a href="activitystreams2-vocabulary.html#dfn-inreplyto">inReplyTo</a> |
+          <a href="activitystreams2-vocabulary.html#dfn-language">language</a> | 
           <a href="activitystreams2-vocabulary.html#dfn-mediatype">mediaType</a> |
           <a href="activitystreams2-vocabulary.html#dfn-rel">rel</a> |
+          <a href="activitystreams2-vocabulary.html#dfn-resultof">resultOf</a> |
           <a href="activitystreams2-vocabulary.html#dfn-title">title</a> |
           <a href="activitystreams2-vocabulary.html#dfn-width">width</a>
         </code>
@@ -649,14 +656,8 @@ <h2><dfn title="Activity" id="activity">Activity</dfn></h2>
     "@id": "urn:example:verb:like",
     "displayName": "like"
   },
-  "actor": {
-    "@type": "http://activitystrea.ms/2.0/Link",
-    "@id": "http://example.org/profiles/joe"
-  },
-  "object": {
-    "@type": "http://activitystrea.ms/2.0/Link",
-    "@id": "http://example.com/notes/1"
-  },
+  "actor": "http://example.org/profiles/joe",
+  "object": "http://example.com/notes/1",
   "published": "2014-09-30T12:34:56Z"
 }
 </code></pre></figure>
